Skip to content

Conversation

@0Delta
Copy link
Contributor

@0Delta 0Delta commented Oct 25, 2021

@lecaros
Copy link
Contributor

lecaros commented Mar 8, 2022

Hi @0Delta,
can you please resolve conflict?
thanks

@lecaros lecaros added conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes labels Mar 8, 2022
@0Delta
Copy link
Contributor Author

0Delta commented Mar 17, 2022

conflict resolved.

@lecaros lecaros removed waiting-for-user Waiting for user/contributors feedback or requested changes 1.9 conflict Waiting on conflict to be resolved by contributor labels Apr 7, 2022
@esmerel esmerel requested review from a team as code owners October 23, 2024 17:20
@esmerel
Copy link
Contributor

esmerel commented Oct 23, 2024

@lecaros This looks like it can be merged - the related ticket is closed and the merge conflict is resolved.

@lecaros
Copy link
Contributor

lecaros commented Nov 9, 2024

merging based on fluent/fluent-bit#4224 (comment)

@lecaros lecaros merged commit 94a1c26 into fluent:master Nov 9, 2024
3 checks passed
TomlinfreeGit pushed a commit to TomlinfreeGit/fluent-bit-docs that referenced this pull request Oct 28, 2025
Ref: [fluent-bit #4224](fluent/fluent-bit#4224)

Signed-off-by: 0Delta <[email protected]>
Signed-off-by: esmerel <[email protected]>
Co-authored-by: esmerel <[email protected]>
Signed-off-by: Tom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants